[8.x] Add explicit @return annotations in {@inheritdoc} from vendors and add some missing #[\ReturnTypeWillChange]
#38819
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wouterj
changed the title
@return annotations in {@inheritdoc} from vendors and add some missing #[\ReturnTypeWillChange]@return annotations in {@inheritdoc} from vendors and add some missing #[\ReturnTypeWillChange]
wouterj
force-pushed
the
phpdoc-return
branch
from
ecf8170
to
0e0e862
Compare
|
Can you target our |
wouterj
force-pushed
the
phpdoc-return
branch
from
0e0e862
to
39ba47f
Compare
wouterj
force-pushed
the
phpdoc-return
branch
from
39ba47f
to
520a802
Compare
Oh, didn't realize Laravel was using this type of branching strategy. PR rebased! |
GrahamCampbell
approved these changes
Sep 15, 2021
Thanks. Yeh, it's only temporary. We'll be merging shortly. :) |
|
Thanks for the quick review and merge! 🚀 |
taylorotwell
added a commit
that referenced
this pull request
Sep 15, 2021
* Add ReturnTypeWillChange to SessionHandlerInterface usages * Bump commonmark * Fix getIterator * Use Symfony 5.4 components * Dev mockery * Mimic PHP 8.0 * Try removing symfony components * Mockery * Fix type errors in db tests (#38696) * Fix type errors in db tests * Apply fixes from StyleCI Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> * Additional DB test fixes (#38699) * More DB fixes (#38700) * PHP 8.1 prefer-lowest builds * Remove skipping PHP 8.1 builds * Bump PHPUnit * Revert "PHP 8.1 prefer-lowest builds" This reverts commit d5b01d2. * [8.x] Adds PHP 8.1 support to serializable closures (#38801) * Makes serializable closures work with PHP 8.1 * Apply fixes from StyleCI * Fixes PHP 7.3 tests * Refactors * Updates deprecated warning Co-authored-by: Dries Vints <dries@vints.io> * Fixes restoring properties * Update QueueServiceProvider.php Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> Co-authored-by: Dries Vints <dries@vints.io> Co-authored-by: Taylor Otwell <taylor@laravel.com> * Fix default value * Fix mb_strlen value * Adds `continue-on-error` for PHP 8.1 * [8.x] Add explicit `@return` annotations in `{@inheritdoc}` from vendors and add some missing `#[\ReturnTypeWillChange]` (#38819) * Add explicit `@return` to `{@inheritdoc}` PHPDoc * Use `return null;` when the return type is `null` * Skips PHP 8.1 failing tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Update SerializableClosure.php Co-authored-by: Graham Campbell <GrahamCampbell@users.noreply.github.com> Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> Co-authored-by: Nuno Maduro <enunomaduro@gmail.com> Co-authored-by: Taylor Otwell <taylor@laravel.com> Co-authored-by: Wouter J <wouterj@users.noreply.github.com>
victorvilella
pushed a commit
to cdsistemas/framework
that referenced
this pull request
Oct 12, 2021
* Add ReturnTypeWillChange to SessionHandlerInterface usages * Bump commonmark * Fix getIterator * Use Symfony 5.4 components * Dev mockery * Mimic PHP 8.0 * Try removing symfony components * Mockery * Fix type errors in db tests (laravel#38696) * Fix type errors in db tests * Apply fixes from StyleCI Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> * Additional DB test fixes (laravel#38699) * More DB fixes (laravel#38700) * PHP 8.1 prefer-lowest builds * Remove skipping PHP 8.1 builds * Bump PHPUnit * Revert "PHP 8.1 prefer-lowest builds" This reverts commit d5b01d2. * [8.x] Adds PHP 8.1 support to serializable closures (laravel#38801) * Makes serializable closures work with PHP 8.1 * Apply fixes from StyleCI * Fixes PHP 7.3 tests * Refactors * Updates deprecated warning Co-authored-by: Dries Vints <dries@vints.io> * Fixes restoring properties * Update QueueServiceProvider.php Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> Co-authored-by: Dries Vints <dries@vints.io> Co-authored-by: Taylor Otwell <taylor@laravel.com> * Fix default value * Fix mb_strlen value * Adds `continue-on-error` for PHP 8.1 * [8.x] Add explicit `@return` annotations in `{@inheritdoc}` from vendors and add some missing `#[\ReturnTypeWillChange]` (laravel#38819) * Add explicit `@return` to `{@inheritdoc}` PHPDoc * Use `return null;` when the return type is `null` * Skips PHP 8.1 failing tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Skips some more PHP 8.1 related tests * Update SerializableClosure.php Co-authored-by: Graham Campbell <GrahamCampbell@users.noreply.github.com> Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com> Co-authored-by: Nuno Maduro <enunomaduro@gmail.com> Co-authored-by: Taylor Otwell <taylor@laravel.com> Co-authored-by: Wouter J <wouterj@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces an
@returnannotation in PHPDoc blocks that reference{@inheritdoc}from a vendor (i.e. noIlluminateroot namespace). This removes the need to rely on external knowledge to get some understanding of the annotations.Besides that, this also functions as an opt-out for the type deprecations triggered by Symfony as of 5.4. Their function is similar to the
#[\ReturnTypeWillChange]attribute: tell static analysers that you know the return type of the parent can be converted to a real type at any release, but you don't want to add the real type yourself yet (I think you will probably add these in Laravel 9?).The type patcher script also discovered
some missing2 cases where#[\ReturnTypeWillChange]attributes (causing deprecations on PHP 8.1) andreturn;was used in combination with anullreturn type. The latter produces a fatal error once the type is introduced (https://3v4l.org/bK7Vt)